Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 15 Nov 2011 06:26:25 +0000 (22:26 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 15 Nov 2011 06:26:25 +0000 (22:26 -0800)

Trivial merge